From 6b995a3b55f8d6660985958a141609f251b82d9e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 4 Dec 2006 09:08:47 +0000 Subject: [PATCH] [PATCH 01/02] Kexec / Kdump: Use NOTE_ALIGN() instead of ALIGN() ALIGN() is already defined in xen/include/asm-ia64/config.h. This patch renames ALIGN() to NOTE_ALIGN() to make the kexec code build on ia64. Signed-Off-By: Magnus Damm --- xen/include/xen/elfcore.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/elfcore.h b/xen/include/xen/elfcore.h index d578d0dd0b..75ce7c49ef 100644 --- a/xen/include/xen/elfcore.h +++ b/xen/include/xen/elfcore.h @@ -71,8 +71,8 @@ typedef struct * That requires infrastructure. Let's not. */ -#define ALIGN(x, n) ((x + ((1 << n) - 1)) / (1 << n)) -#define PAD32(x) u32 pad_data[ALIGN(x, 2)] +#define NOTE_ALIGN(x, n) ((x + ((1 << n) - 1)) / (1 << n)) +#define PAD32(x) u32 pad_data[NOTE_ALIGN(x, 2)] #define TYPEDEF_NOTE(type, strlen, desctype) \ typedef struct { \ -- 2.30.2